Use forked gir with updated shell-words and cleaned-up build.rs

diff --git a/rust-bindings/rust/Makefile b/rust-bindings/rust/Makefile
index eac5ed375346e8885fddab2b4339118bb99fa17a..eb89923fb251fdbcfc4d6429cd3fcd22abef5e7f 100644 (file)
--- a/rust-bindings/rust/Makefile
+++ b/rust-bindings/rust/Makefile
@@ -1,4 +1,5 @@
-GIR_VERSION := 60cbef05401bd73c3e8a0a7c0cbfb793394acfe7
+GIR_REPO := https://github.com/fkrull/gir.git
+GIR_VERSION := d7f05b3cba10b6e25d0504e492965e20466d091f
 RUSTDOC_STRIPPER_VERSION := 0.1.9
 
 all: gir
@@ -8,7 +9,7 @@ all: gir
 
 # -- gir generation --
 target/tools/bin/gir:
-       cargo install --root target/tools --git https://github.com/gtk-rs/gir.git --rev $(GIR_VERSION) -- gir
+       cargo install --root target/tools --git $(GIR_REPO) --rev $(GIR_VERSION) -- gir
 
 gir: target/tools/bin/gir
        target/tools/bin/gir -c conf/ostree-sys.toml

diff --git a/rust-bindings/rust/src/auto/versions.txt b/rust-bindings/rust/src/auto/versions.txt
index 036b2833f7d5f91b0352b7881b7e06d6262f01fa..377fbbe3fab738fb2fb6cc84d40c26c58e97d5f8 100644 (file)
--- a/rust-bindings/rust/src/auto/versions.txt
+++ b/rust-bindings/rust/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 60cbef05)
-from gir-files (https://github.com/gtk-rs/gir-files @ 519df63)
+Generated by gir (https://github.com/gtk-rs/gir @ d7f05b3c)
+from gir-files (https://github.com/gtk-rs/gir-files @ 318d9b7)

diff --git a/rust-bindings/rust/sys/Cargo.toml b/rust-bindings/rust/sys/Cargo.toml
index ee50239c1de2153c95af24e1f01c11b7e13db988..51595f52321f96dc5f46b0601d7464e893dd9f1f 100644 (file)
--- a/rust-bindings/rust/sys/Cargo.toml
+++ b/rust-bindings/rust/sys/Cargo.toml
@@ -11,7 +11,7 @@ gobject-sys = "0.10.0"
 libc = "0.2"
 
 [dev-dependencies]
-shell-words = "0.1.0"
+shell-words = "1.0.0"
 tempfile = "3"
 
 [features]

diff --git a/rust-bindings/rust/sys/build.rs b/rust-bindings/rust/sys/build.rs
index bd5481bee3c2a90bf90e6bd2570f5204faa3dd2c..f4c4e7c7d4eb623b3a89b9a0b6e5092b93e8e158 100644 (file)
--- a/rust-bindings/rust/sys/build.rs
+++ b/rust-bindings/rust/sys/build.rs
@@ -5,10 +5,6 @@
 #[cfg(not(feature = "dox"))]
 extern crate system_deps;
 
-#[cfg(not(feature = "dox"))]
-use std::io::prelude::*;
-#[cfg(not(feature = "dox"))]
-use std::io;
 #[cfg(not(feature = "dox"))]
 use std::process;
 

diff --git a/rust-bindings/rust/sys/src/auto/versions.txt b/rust-bindings/rust/sys/src/auto/versions.txt
index 036b2833f7d5f91b0352b7881b7e06d6262f01fa..377fbbe3fab738fb2fb6cc84d40c26c58e97d5f8 100644 (file)
--- a/rust-bindings/rust/sys/src/auto/versions.txt
+++ b/rust-bindings/rust/sys/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 60cbef05)
-from gir-files (https://github.com/gtk-rs/gir-files @ 519df63)
+Generated by gir (https://github.com/gtk-rs/gir @ d7f05b3c)
+from gir-files (https://github.com/gtk-rs/gir-files @ 318d9b7)